Use convenience API that was introduced recently

Use gtk_css_gadget_set_state in all the places where we previously
were getting a node from a gadget, just to call gtk_css_node_set_state.

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 42b0d7073343df5833fbb8fdd66f868018a00e31..c81015bd1eada16535a2e2f652f15e8bc1f2e4b2 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -156,10 +156,11 @@ gtk_check_button_update_node_state (GtkWidget *widget)
   else
     image_type = GTK_IS_RADIO_BUTTON (widget) ? GTK_CSS_IMAGE_BUILTIN_OPTION : GTK_CSS_IMAGE_BUILTIN_CHECK;
   gtk_builtin_icon_set_image (GTK_BUILTIN_ICON (priv->indicator_gadget), image_type);
-  
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->indicator_gadget), state);
+
+  gtk_css_gadget_set_state (priv->indicator_gadget, state);
 }
 
+
 static void
 gtk_check_button_state_flags_changed (GtkWidget     *widget,
                                      GtkStateFlags  previous_state_flags)

diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 5121ad86f7253b9691f148541ae46b54cdf12bf4..4a0f8ff31cf909983b35137b71e3e7f75d01b703 100644 (file)
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -486,8 +486,7 @@ update_node_state (GtkCheckMenuItem *check_menu_item)
   if (priv->active)
     state |= GTK_STATE_FLAG_CHECKED;
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->indicator_gadget),
-                          state);
+  gtk_css_gadget_set_state (priv->indicator_gadget, state);
 }
 
 /**

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 7d1b9ea0f7e82f3f2c768b20d973888cd4b87948..175167fe21167448df80794f60c1ca92d45d2df9 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -578,8 +578,8 @@ swatch_state_flags_changed (GtkWidget     *widget,
 {
   GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (swatch->priv->gadget), gtk_widget_get_state_flags (widget));
-  gtk_css_node_set_state (gtk_css_gadget_get_node (swatch->priv->overlay_gadget), gtk_widget_get_state_flags (widget));
+  gtk_css_gadget_set_state (swatch->priv->gadget, gtk_widget_get_state_flags (widget));
+  gtk_css_gadget_set_state (swatch->priv->overlay_gadget, gtk_widget_get_state_flags (widget));
 
   update_icon (swatch);
 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 26d877ee26b13118b991003ed332e499cfe61ae8..d95cff8973532cd3b8a10d41a5e751a6454585d7 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3194,7 +3194,7 @@ update_icon_state (GtkWidget            *widget,
   else if (icon_info->prelight)
     state |= GTK_STATE_FLAG_PRELIGHT;
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (icon_info->gadget), state);
+  gtk_css_gadget_set_state (icon_info->gadget, state);
 }
 
 static void

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 8891e398be468b819551935364255d1b60a00284..aa80567b1dcad6702584e72cef4e5b5bf8b86ac2 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -957,14 +957,14 @@ update_node_state (GtkExpander *expander)
   else
     state &= ~GTK_STATE_FLAG_PRELIGHT;
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->title_gadget), state);
+  gtk_css_gadget_set_state (priv->title_gadget, state);
 
   if (priv->expanded)
     state |= GTK_STATE_FLAG_CHECKED;
   else
     state &= ~GTK_STATE_FLAG_CHECKED;
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->arrow_gadget), state);
+  gtk_css_gadget_set_state (priv->arrow_gadget, state);
 }
 
 static void

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index e71477118cd4e76cf1a43382adb151ef288fe49e..ac5af4a7c7794e95b4ad25ce566c0ee0950b4ba7 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -1023,10 +1023,7 @@ static void
 gtk_frame_state_flags_changed (GtkWidget     *widget,
                                GtkStateFlags  previous_state)
 {
-  GtkCssNode *border_node;
-
-  border_node = gtk_css_gadget_get_node (GTK_FRAME (widget)->priv->border_gadget);
-  gtk_css_node_set_state (border_node, gtk_widget_get_state_flags (widget));
+  gtk_css_gadget_set_state (GTK_FRAME (widget)->priv->border_gadget, gtk_widget_get_state_flags (widget));
 
   GTK_WIDGET_CLASS (gtk_frame_parent_class)->state_flags_changed (widget, previous_state);
 }

diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index f681680907367a6d741f173dca8a7dce045a772c..18232a63c862f294947711ce72fb768b6e2f0f29 100644 (file)
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -579,8 +579,7 @@ update_block_nodes (GtkLevelBar *self)
                                                              NULL,
                                                              NULL, NULL, NULL,
                                                              NULL, NULL);
-          gtk_css_node_set_state (gtk_css_gadget_get_node (priv->block_gadget[i]),
-                                  gtk_css_node_get_state (trough_node));
+          gtk_css_gadget_set_state (priv->block_gadget[i], gtk_css_node_get_state (trough_node));
         }
       priv->n_blocks = n_blocks;
     }
@@ -616,9 +615,9 @@ gtk_level_bar_state_flags_changed (GtkWidget     *widget,
 
   state = gtk_widget_get_state_flags (widget);
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->trough_gadget), state);
+  gtk_css_gadget_set_state (priv->trough_gadget, state);
   for (i = 0; i < priv->n_blocks; i++)
-    gtk_css_node_set_state (gtk_css_gadget_get_node (priv->block_gadget[i]), state);
+    gtk_css_gadget_set_state (priv->block_gadget[i], state);
 
   GTK_WIDGET_CLASS (gtk_level_bar_parent_class)->state_flags_changed (widget, previous_state);
 }

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 43f20fe0ebbafd9a33a81de6f651618d49182513..cdf2aecb2e6a4f8135b6acc0e118583fe71a5dbd 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -3695,8 +3695,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
           if (arrow_state != priv->upper_arrow_state)
             {
               priv->upper_arrow_state = arrow_state;
-              gtk_css_node_set_state (gtk_css_gadget_get_node (priv->top_arrow_gadget),
-                                      arrow_state);
+              gtk_css_gadget_set_state (priv->top_arrow_gadget, arrow_state);
 
               gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (menu)),
                                           &rect, FALSE);
@@ -3770,8 +3769,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
           if (arrow_state != priv->lower_arrow_state)
             {
               priv->lower_arrow_state = arrow_state;
-              gtk_css_node_set_state (gtk_css_gadget_get_node (priv->bottom_arrow_gadget),
-                                      arrow_state);
+              gtk_css_gadget_set_state (priv->bottom_arrow_gadget, arrow_state);
 
               gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (menu)),
                                           &rect, FALSE);

diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index e67a57e01e8e20ff18ef7b8b48443aad02618aa1..1446aab0039cbb18cd653eecb41f1d4fc0d49849 100644 (file)
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -201,7 +201,7 @@ gtk_model_button_update_state (GtkModelButton *button)
 
   state = gtk_widget_get_state_flags (GTK_WIDGET (button));
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (button->gadget), state);
+  gtk_css_gadget_set_state (button->gadget, state);
 
   if (button->role == GTK_BUTTON_ROLE_CHECK)
     {
@@ -239,7 +239,7 @@ gtk_model_button_update_state (GtkModelButton *button)
     }
 
   gtk_builtin_icon_set_image (GTK_BUILTIN_ICON (button->indicator_gadget), image_type);
-  gtk_css_node_set_state (gtk_css_gadget_get_node (button->indicator_gadget), state);
+  gtk_css_gadget_set_state (button->indicator_gadget, state);
 }
 
 static void

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 13731c3a4398304c72d7ed4aeca2f845beb24bcf..ca47e7045883d64c41e6477484a870c87aaf6ddb 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -505,11 +505,11 @@ update_node_state (GtkProgressBar *pbar)
 
   state = gtk_widget_get_state_flags (GTK_WIDGET (pbar));
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->gadget), state);
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->trough_gadget), state);
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->progress_gadget), state);
+  gtk_css_gadget_set_state (priv->gadget, state);
+  gtk_css_gadget_set_state (priv->trough_gadget, state);
+  gtk_css_gadget_set_state (priv->progress_gadget, state);
   if (priv->text_gadget)
-    gtk_css_node_set_state (gtk_css_gadget_get_node (priv->text_gadget), state);
+    gtk_css_gadget_set_state (priv->text_gadget, state);
 }
 
 static void

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 84d1b7c52b1428f754218502eb62b72327bdfe69..7e256df91e27c04fd1fdb30062b62ad5f20db57c 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -956,10 +956,8 @@ update_node_state (GtkSpinButton *spin_button)
 {
   GtkSpinButtonPrivate *priv = spin_button->priv;
 
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->up_button),
-                          gtk_spin_button_panel_get_state (spin_button, UP_PANEL));
-  gtk_css_node_set_state (gtk_css_gadget_get_node (priv->down_button),
-                          gtk_spin_button_panel_get_state (spin_button, DOWN_PANEL));
+  gtk_css_gadget_set_state (priv->up_button, gtk_spin_button_panel_get_state (spin_button, UP_PANEL));
+  gtk_css_gadget_set_state (priv->down_button, gtk_spin_button_panel_get_state (spin_button, DOWN_PANEL));
 }
 
 static void